compile more tests on Windows (#183)

* compile more tests on Windows

* still disable charwidth tests

* silence warnings on MSVC about sscanf

* whoops

* silence warning

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bfc3f9be72777b142fbf4c780736fd2397911ac0..1ed971648fb7ef71bac47362d982abafae66d0cb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,15 +82,15 @@ if(UTF8PROC_ENABLE_TESTING)
   add_test(testprintproperty printproperty)
   add_test(testvalid valid)
   if (NOT WIN32)
-    # Some test disabled, because they don't compile on Windows, missing getline, ...
+    # no wcwidth function on Windows
     add_executable(charwidth test/tests.h test/tests.c utf8proc.h test/charwidth.c)
     target_link_libraries(charwidth utf8proc)
-    add_executable(graphemetest test/tests.h test/tests.c utf8proc.h test/graphemetest.c)
-    target_link_libraries(graphemetest utf8proc)
-    add_executable(normtest test/tests.h test/tests.c utf8proc.h test/normtest.c)
-    target_link_libraries(normtest utf8proc)
     add_test(testcharwidth charwidth)
-    #add_test(testgraphemetest graphemetest data/GraphemeBreakTest.txt)
-    #add_test(testnormtest normtest data/NormalizationTest.txt)
   endif()
+  add_executable(graphemetest test/tests.h test/tests.c utf8proc.h test/graphemetest.c)
+  target_link_libraries(graphemetest utf8proc)
+  add_executable(normtest test/tests.h test/tests.c utf8proc.h test/normtest.c)
+  target_link_libraries(normtest utf8proc)
+  #add_test(testgraphemetest graphemetest data/GraphemeBreakTest.txt)
+  #add_test(testnormtest normtest data/NormalizationTest.txt)
 endif()

diff --git a/test/graphemetest.c b/test/graphemetest.c
index 25c7ddb2179528c87816fe438d81766c34b11762..f9b8e3e0eda9d49fc185c6435ee27ecdef4d21d3 100644 (file)
--- a/test/graphemetest.c
+++ b/test/graphemetest.c
@@ -42,7 +42,7 @@ int main(int argc, char **argv)
         if (si) {
             utf8proc_uint8_t utf8[1024]; /* copy src without 0xff grapheme separators */
             size_t i = 0, j = 0;
-            utf8proc_ssize_t glen;
+            utf8proc_ssize_t glen, k;
             utf8proc_uint8_t *g; /* utf8proc_map grapheme results */
             while (i < si) {
                 if (src[i] != '/')
@@ -58,9 +58,9 @@ int main(int argc, char **argv)
             else {
                  check(glen >= 0, "utf8proc_map error = %s",
                        utf8proc_errmsg(glen));
-                 for (i = 0; i <= glen; ++i)
-                      if (g[i] == 0xff)
-                          g[i] = '/'; /* easier-to-read output (/ is not in test strings) */
+                 for (k = 0; k <= glen; ++k)
+                      if (g[k] == 0xff)
+                          g[k] = '/'; /* easier-to-read output (/ is not in test strings) */
                  check(!strcmp((char*)g, (char*)src),
                        "grapheme mismatch: \"%s\" instead of \"%s\"", (char*)g, (char*)src);
             }

diff --git a/test/tests.h b/test/tests.h
index 8447e8694523aa3923150c96447cc341f1f337a1..9bb35a35a73671c51f2ae2bde9c33cfe79e3bfae 100644 (file)
--- a/test/tests.h
+++ b/test/tests.h
@@ -1,13 +1,16 @@
 /* Common functions and includes for our test programs. */
 
 /*
- * Set feature macro to enable getline() and wcwidth().
+ * Set feature macro to enable wcwidth().
  *
  * Please refer to section 2.2.1 of POSIX.1-2008:
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/V2_chap02.html#tag_15_02_01_02
  */
 #define _XOPEN_SOURCE 700
 
+/* silence warnings about sscanf on Windows */
+#define _CRT_SECURE_NO_WARNINGS
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>